Add a function to obtain the last user interaction time. (#163119, Elijah

2005-01-19  Matthias Clasen  <mclasen@redhat.com>

	* gdk/gdk.symbols:
	* gdk/x11/gdkx.h:
	* gdk/x11/gdkdisplay-x11.c (gdk_x11_display_get_user_time):
	Add a function to obtain the last user interaction
	time.  (#163119, Elijah Newren)

diff --git a/ChangeLog b/ChangeLog
index efbe7bd2d711142e51c8fb30fd1b88d74c201287..a4acc7ec3a3c80e0a7d11659ec5f24c71a60b931 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/gdk.symbols: 
+       * gdk/x11/gdkx.h: 
+       * gdk/x11/gdkdisplay-x11.c (gdk_x11_display_get_user_time): 
+       Add a function to obtain the last user interaction 
+       time.  (#163119, Elijah Newren)
+
 Tue Jan 18 13:56:09 2005  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkfilechooserdefault.c (pending_op_queue): Actually assign

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index efbe7bd2d711142e51c8fb30fd1b88d74c201287..a4acc7ec3a3c80e0a7d11659ec5f24c71a60b931 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2005-01-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/gdk.symbols: 
+       * gdk/x11/gdkx.h: 
+       * gdk/x11/gdkdisplay-x11.c (gdk_x11_display_get_user_time): 
+       Add a function to obtain the last user interaction 
+       time.  (#163119, Elijah Newren)
+
 Tue Jan 18 13:56:09 2005  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkfilechooserdefault.c (pending_op_queue): Actually assign

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index efbe7bd2d711142e51c8fb30fd1b88d74c201287..a4acc7ec3a3c80e0a7d11659ec5f24c71a60b931 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2005-01-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/gdk.symbols: 
+       * gdk/x11/gdkx.h: 
+       * gdk/x11/gdkdisplay-x11.c (gdk_x11_display_get_user_time): 
+       Add a function to obtain the last user interaction 
+       time.  (#163119, Elijah Newren)
+
 Tue Jan 18 13:56:09 2005  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkfilechooserdefault.c (pending_op_queue): Actually assign

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index a0924b68ad02fdabbbf375a51bac1a2d5513fb4c..7043eb1274b8ac86897d50eabf6fa9d5b79fc811 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/gdk-sections.txt: Add gdk_x11_display_get_user_time.
+
 2005-01-18  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtk-docs.sgml: Add an index for 2.8 symbols.

diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt
index 0ed10e21479d63c2eb2e2d65519dbce7e5d571a3..cbba5c3b23e402ea5c74f2ce6f4e2d214bc3108f 100644 (file)
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -1240,6 +1240,7 @@ gdk_x11_screen_supports_net_wm_hint
 gdk_x11_screen_get_window_manager_name
 gdk_x11_screen_lookup_visual
 gdk_x11_window_set_user_time
+gdk_x11_display_get_user_time
 gdk_x11_colormap_foreign_new
 gdk_x11_colormap_get_xcolormap
 gdk_x11_colormap_get_xdisplay

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index c3e7a0407997ee041e50df47d8ca9373df664177..e4f5cf3de800515fa201984ec852c09d15201794 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -605,6 +605,7 @@ gdk_x11_colormap_get_xcolormap
 gdk_x11_colormap_get_xdisplay
 gdk_x11_cursor_get_xcursor
 gdk_x11_cursor_get_xdisplay
+gdk_x11_display_get_user_time
 gdk_x11_display_get_xdisplay
 gdk_x11_display_grab
 gdk_x11_display_ungrab

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 4f29331ec0e9a603c8074058092d24149a417979..ba0883ce2751a50c156db54bf521035b84469c13 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1162,3 +1162,22 @@ gdk_display_store_clipboard (GdkDisplay *display,
   gdk_error_trap_pop ();
 
 }
+
+/**
+ * gdk_x11_display_get_user_time:
+ * @display: a #GdkDisplay
+ *
+ * Returns the timestamp of the last user interaction on 
+ * @display. The timestamp is taken from events caused
+ * by user interaction such as key presses or pointer 
+ * movements. See gdk_x11_window_set_user_time().
+ *
+ * Returns: the timestamp of the last user interaction 
+ *
+ * Since: 2.8
+ */
+guint32
+gdk_x11_display_get_user_time (GdkDisplay *display)
+{
+  return GDK_DISPLAY_X11 (display)->user_time;
+}

diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index 51646f4f96114685bafd4ea6eae56ed5ff41fc75..2e933b7069286ac28a8de35d7135e2190a096fa1 100644 (file)
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -139,6 +139,7 @@ GdkColormap *gdk_x11_colormap_foreign_new (GdkVisual *visual,
 gpointer      gdk_xid_table_lookup_for_display (GdkDisplay *display,
                                                XID         xid);
 guint32       gdk_x11_get_server_time  (GdkWindow       *window);
+guint32       gdk_x11_display_get_user_time (GdkDisplay *display);
 
 /* returns TRUE if we support the given WM spec feature */
 gboolean gdk_x11_screen_supports_net_wm_hint (GdkScreen *screen,